From: Jeroen van der Heijden Date: Fri, 6 Nov 2020 11:12:34 +0000 (+0100) Subject: Upd changelog, move to docs, update test X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~1^2~3^2~1^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6dfc8b3af12044fb3dd861d5c1240da8527fb7fb;p=siridb-server.git Upd changelog, move to docs, update test --- diff --git a/Kubernetes/service.yaml b/Kubernetes/service.yaml deleted file mode 100644 index 1a17ced3..00000000 --- a/Kubernetes/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: siridb - name: siridb -spec: - clusterIP: None - publishNotReadyAddresses: true - ports: - - name: status - port: 8080 - - name: client - port: 9000 - - name: http - port: 9080 - - name: server - port: 9010 - selector: - app: siridb \ No newline at end of file diff --git a/Kubernetes/statefulset.yaml b/Kubernetes/statefulset.yaml deleted file mode 100644 index 7ff92caf..00000000 --- a/Kubernetes/statefulset.yaml +++ /dev/null @@ -1,85 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: siridb - labels: - app: siridb -spec: - selector: - matchLabels: - app: siridb - serviceName: siridb - replicas: 2 # Multiple of 2, to create pools with two servers. - updateStrategy: - type: RollingUpdate - podManagementPolicy: Parallel - template: - metadata: - labels: - app: siridb - spec: - terminationGracePeriodSeconds: 120 - dnsConfig: - searches: - - siridb.default.svc.cluster.local - containers: - - name: siridb - image: siridb/siridb-server:2.0.40 # Pin to a specific version - imagePullPolicy: Always - env: - - name: SIRIDB_HTTP_STATUS_PORT - value: "8080" - - name: SIRIDB_HTTP_API_PORT - value: "9080" - - name: SIRIDB_ENABLE_SHARD_COMPRESSION - value: "1" - - name: SIRIDB_ENABLE_SHARD_AUTO_DURATION - value: "1" - - name: SIRIDB_BUFFER_SYNC_INTERVAL - value: "500" - - name: SIRIDB_DEFAULT_DB_PATH - value: /mnt/siridb/ - - name: SIRIDB_BIND_SERVER_ADDRESS - value: "0.0.0.0" - - name: SIRIDB_BIND_CLIENT_ADDRESS - value: "0.0.0.0" - - name: SIRIDB_SERVER_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - ports: - - name: status - containerPort: 8080 - - name: client - containerPort: 9000 - - name: http - containerPort: 9080 - - name: server - containerPort: 9010 - volumeMounts: - - name: data - mountPath: /mnt/siridb/ - resources: - requests: - memory: 100M # For example, 3Gi for large data sets - livenessProbe: - httpGet: - path: /healthy - port: 8080 - periodSeconds: 20 - timeoutSeconds: 10 - readinessProbe: - httpGet: - path: /ready - port: 8080 - initialDelaySeconds: 15 - periodSeconds: 20 - timeoutSeconds: 10 - volumeClaimTemplates: - - metadata: - name: data - spec: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 200Mi # For example, 300Gi for large data sets diff --git a/debian/changelog b/debian/changelog index d4ca21ea..123a0ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +siridb-server (2.0.41-0~tt1) unstable; urgency=medium + + * New upstream release + - Fixed bug in insert loop (#147) + - Fixed loading databases with duplicated series (#148) + - Allow server names without defining a port (#150) + + -- Jeroen van der Heijden Wed, 04 Nov 2020 13:15:29 +0100 + siridb-server (2.0.40-0~tt1) unstable; urgency=medium * New upstream release diff --git a/docs/Kubernetes/README.md b/docs/Kubernetes/README.md new file mode 100644 index 00000000..a1ae30c2 --- /dev/null +++ b/docs/Kubernetes/README.md @@ -0,0 +1,5 @@ +# Running SiriDB in Kubernetes + +This folder contains a service and statefulset definition which can be used as example configuration +for running SiriDB in Kubernetes. + diff --git a/docs/Kubernetes/service.yaml b/docs/Kubernetes/service.yaml new file mode 100644 index 00000000..1a17ced3 --- /dev/null +++ b/docs/Kubernetes/service.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: siridb + name: siridb +spec: + clusterIP: None + publishNotReadyAddresses: true + ports: + - name: status + port: 8080 + - name: client + port: 9000 + - name: http + port: 9080 + - name: server + port: 9010 + selector: + app: siridb \ No newline at end of file diff --git a/docs/Kubernetes/statefulset.yaml b/docs/Kubernetes/statefulset.yaml new file mode 100644 index 00000000..7ff92caf --- /dev/null +++ b/docs/Kubernetes/statefulset.yaml @@ -0,0 +1,85 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: siridb + labels: + app: siridb +spec: + selector: + matchLabels: + app: siridb + serviceName: siridb + replicas: 2 # Multiple of 2, to create pools with two servers. + updateStrategy: + type: RollingUpdate + podManagementPolicy: Parallel + template: + metadata: + labels: + app: siridb + spec: + terminationGracePeriodSeconds: 120 + dnsConfig: + searches: + - siridb.default.svc.cluster.local + containers: + - name: siridb + image: siridb/siridb-server:2.0.40 # Pin to a specific version + imagePullPolicy: Always + env: + - name: SIRIDB_HTTP_STATUS_PORT + value: "8080" + - name: SIRIDB_HTTP_API_PORT + value: "9080" + - name: SIRIDB_ENABLE_SHARD_COMPRESSION + value: "1" + - name: SIRIDB_ENABLE_SHARD_AUTO_DURATION + value: "1" + - name: SIRIDB_BUFFER_SYNC_INTERVAL + value: "500" + - name: SIRIDB_DEFAULT_DB_PATH + value: /mnt/siridb/ + - name: SIRIDB_BIND_SERVER_ADDRESS + value: "0.0.0.0" + - name: SIRIDB_BIND_CLIENT_ADDRESS + value: "0.0.0.0" + - name: SIRIDB_SERVER_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + ports: + - name: status + containerPort: 8080 + - name: client + containerPort: 9000 + - name: http + containerPort: 9080 + - name: server + containerPort: 9010 + volumeMounts: + - name: data + mountPath: /mnt/siridb/ + resources: + requests: + memory: 100M # For example, 3Gi for large data sets + livenessProbe: + httpGet: + path: /healthy + port: 8080 + periodSeconds: 20 + timeoutSeconds: 10 + readinessProbe: + httpGet: + path: /ready + port: 8080 + initialDelaySeconds: 15 + periodSeconds: 20 + timeoutSeconds: 10 + volumeClaimTemplates: + - metadata: + name: data + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 200Mi # For example, 300Gi for large data sets diff --git a/include/siri/version.h b/include/siri/version.h index 4aaf6e4f..cad307c4 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "-alpha-2" +#define SIRIDB_VERSION_PRE_RELEASE "" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/itest/test_tags.py b/itest/test_tags.py index 43e11360..60b33eb1 100644 --- a/itest/test_tags.py +++ b/itest/test_tags.py @@ -213,7 +213,7 @@ class TestTags(TestBase): drop series '{0}' '''.format(series)) - await asyncio.sleep(3.0) + await asyncio.sleep(6.0) # groups and tags are updates each 3 seconds for client in (self.client0, self.client1, self.client2): res = await self.client0.query('''